Added better padding and colors