Fix gliches and inconsistency between screen sizes