lined up buttons and fixed text overlapping issues