Clean up relative layout
Fix border error