Fix Overflow, CSS improvements