Designed borders in main_acitivity.
Merged desing with border update.