Minor visual update and a bit of bug fixing!