Fixes for text-alignment and TextField sizing issues