Finished editing basic app setup