Alignment and size issue fix