Corner cases + minor visual changes