Minor visual update & extra features (unfinished)