#2 add border. clean layouts