added buttons to the top. added warning exclam.-mark when conflicts. layout now seamless (awesome)