Layout Updates and Icon Added