Fixed bug of double Application.
Added some layout