Redid Layout of selfactivity