Redesign

@koutoftimer please review. I made redesign.