Feature/add padding and round corners