Some layout improvements

got rid of the warnings and fixed the first line issue