Removed unused includes
Added res layout and styling